if (FRAME_XIM (f))
{
XDestroyIC (FRAME_XIC (f));
-#ifndef SOLARIS2 /* This code causes crashes on Solaris 2.3 and 2.5,
- due to an apparent bug in XCloseIM.
- The bug may be only in Openwin and not in X11R6. */
+#if ! defined (SOLARIS2) || defined (HAVE_X11R6)
+ /* This line causes crashes on Solaris with Openwin,
+ due to an apparent bug in XCloseIM.
+ X11R6 seems not to have the bug. */
XCloseIM (FRAME_XIM (f));
#endif
}